From 0e2b6b009c12055e58441bf5a455915930ae55b3 Mon Sep 17 00:00:00 2001
From: Miles Bader <miles@gnu.org>
Date: Tue, 3 Feb 2004 21:46:35 +0000
Subject: [PATCH] Resolve CVS conflicts

---
 lisp/x-dnd.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index e23788785ba..18fcb62d6bf 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -600,4 +600,5 @@ FORMAT is 32 (not used).  MESSAGE is the data part of an XClientMessageEvent."
 
 (provide 'x-dnd)
 
+;;; arch-tag: b621fb7e-50da-4323-850b-5fc71ae64621
 ;;; x-dnd.el ends here
-- 
2.30.2